From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 22 Jan 2007 08:28:15 +0000 (+0000)
Subject: [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~2700
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=55300c7e7d0becbb5c16fa565acfce7857c5c56c;p=emacs.git

[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
pass keyboard modifiers to mac_store_drag_event, but put them as
kEventParamKeyModifiers Apple event parameter.
---

diff --git a/src/macselect.c b/src/macselect.c
index f9193574bfb..8e86c7651e2 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -1562,10 +1562,17 @@ mac_do_receive_drag (window, refcon, drag)
       GlobalToLocal (&mouse_pos);
       err = GetDragModifiers (drag, NULL, NULL, &modifiers);
     }
+  if (err == noErr)
+    {
+      UInt32 key_modifiers = modifiers;
+
+      err = AEPutParamPtr (&apple_event, kEventParamKeyModifiers,
+			   typeUInt32, &key_modifiers, sizeof (UInt32));
+    }
 
   if (err == noErr)
     {
-      mac_store_drag_event (window, mouse_pos, modifiers, &apple_event);
+      mac_store_drag_event (window, mouse_pos, 0, &apple_event);
       AEDisposeDesc (&apple_event);
       mac_wakeup_from_rne ();
       return noErr;